Fix syntax error introduced with earlier commit) (pointed out by Ollie

Mon Feb  5 22:05:57 2001  Owen Taylor  <otaylor@redhat.com>

	* gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Fix syntax
	error introduced with earlier commit) (pointed out by
	Ollie Lho)

diff --git a/ChangeLog b/ChangeLog
index 9b7bc3b33d72c4c538aa9b21be0011a98234f622..b69f157613c28da3f1b0ed45f72dbc97a25aaecc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Mon Feb  5 22:05:57 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Fix syntax
+       error introduced with earlier commit) (pointed out by
+       Ollie Lho)
+
+Mon Feb  5 12:25:06 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkbutton.c: Remove calls to gtk_grab_add/gtk_grab_remove,
+       which are no longer necessary.
+
 Mon Feb  5 13:22:54 GMT 2001  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: s/MISK/MISC/

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9b7bc3b33d72c4c538aa9b21be0011a98234f622..b69f157613c28da3f1b0ed45f72dbc97a25aaecc 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+Mon Feb  5 22:05:57 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Fix syntax
+       error introduced with earlier commit) (pointed out by
+       Ollie Lho)
+
+Mon Feb  5 12:25:06 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkbutton.c: Remove calls to gtk_grab_add/gtk_grab_remove,
+       which are no longer necessary.
+
 Mon Feb  5 13:22:54 GMT 2001  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: s/MISK/MISC/

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9b7bc3b33d72c4c538aa9b21be0011a98234f622..b69f157613c28da3f1b0ed45f72dbc97a25aaecc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+Mon Feb  5 22:05:57 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Fix syntax
+       error introduced with earlier commit) (pointed out by
+       Ollie Lho)
+
+Mon Feb  5 12:25:06 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkbutton.c: Remove calls to gtk_grab_add/gtk_grab_remove,
+       which are no longer necessary.
+
 Mon Feb  5 13:22:54 GMT 2001  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: s/MISK/MISC/

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9b7bc3b33d72c4c538aa9b21be0011a98234f622..b69f157613c28da3f1b0ed45f72dbc97a25aaecc 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+Mon Feb  5 22:05:57 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Fix syntax
+       error introduced with earlier commit) (pointed out by
+       Ollie Lho)
+
+Mon Feb  5 12:25:06 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkbutton.c: Remove calls to gtk_grab_add/gtk_grab_remove,
+       which are no longer necessary.
+
 Mon Feb  5 13:22:54 GMT 2001  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: s/MISK/MISC/

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9b7bc3b33d72c4c538aa9b21be0011a98234f622..b69f157613c28da3f1b0ed45f72dbc97a25aaecc 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+Mon Feb  5 22:05:57 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Fix syntax
+       error introduced with earlier commit) (pointed out by
+       Ollie Lho)
+
+Mon Feb  5 12:25:06 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkbutton.c: Remove calls to gtk_grab_add/gtk_grab_remove,
+       which are no longer necessary.
+
 Mon Feb  5 13:22:54 GMT 2001  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: s/MISK/MISC/

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9b7bc3b33d72c4c538aa9b21be0011a98234f622..b69f157613c28da3f1b0ed45f72dbc97a25aaecc 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+Mon Feb  5 22:05:57 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Fix syntax
+       error introduced with earlier commit) (pointed out by
+       Ollie Lho)
+
+Mon Feb  5 12:25:06 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkbutton.c: Remove calls to gtk_grab_add/gtk_grab_remove,
+       which are no longer necessary.
+
 Mon Feb  5 13:22:54 GMT 2001  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: s/MISK/MISC/

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9b7bc3b33d72c4c538aa9b21be0011a98234f622..b69f157613c28da3f1b0ed45f72dbc97a25aaecc 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+Mon Feb  5 22:05:57 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Fix syntax
+       error introduced with earlier commit) (pointed out by
+       Ollie Lho)
+
+Mon Feb  5 12:25:06 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkbutton.c: Remove calls to gtk_grab_add/gtk_grab_remove,
+       which are no longer necessary.
+
 Mon Feb  5 13:22:54 GMT 2001  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: s/MISK/MISC/

diff --git a/gdk/linux-fb/gdkimage-fb.c b/gdk/linux-fb/gdkimage-fb.c
index 81251ff2e0b6644627da8f18c5d9e34ef920aca4..26aded2a243b0b7a6fd79d2680784abe86f40776 100644 (file)
--- a/gdk/linux-fb/gdkimage-fb.c
+++ b/gdk/linux-fb/gdkimage-fb.c
@@ -166,7 +166,6 @@ _gdk_fb_get_image (GdkDrawable *drawable,
 {
   GdkImage *image;
   GdkImagePrivateFB *private;
-  gint bits_per_pixel = 
   GdkPixmapFBData fbd;
 
   g_return_val_if_fail (drawable != NULL, NULL);

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index a664032692dcc6b91005688c667a383c8c3ac581..f1cf1f4ab95fbc5b554f4f507c19e0dd3e59a2ba 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -746,10 +746,7 @@ gtk_button_button_press (GtkWidget      *widget,
        gtk_widget_grab_focus (widget);
 
       if (event->button == 1)
-       {
-         gtk_grab_add (GTK_WIDGET (button));
-         gtk_button_pressed (button);
-       }
+       gtk_button_pressed (button);
     }
 
   return TRUE;
@@ -768,7 +765,6 @@ gtk_button_button_release (GtkWidget      *widget,
   if (event->button == 1)
     {
       button = GTK_BUTTON (widget);
-      gtk_grab_remove (GTK_WIDGET (button));
       gtk_button_released (button);
     }